From: kaf24@localhost.localdomain <kaf24@localhost.localdomain>
Date: Thu, 28 Dec 2006 17:09:34 +0000 (+0000)
Subject: [HVM][VMX] Fix regs set/get decoding in VMXAssist.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15422^2~132
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=5737d00f0d57eec8dd69639d6db57aabf32e8904;p=xen.git

[HVM][VMX] Fix regs set/get decoding in VMXAssist.

Signed-off-by: Yunhong Jiang <yunhong.jiang@intel.com>
Signed-off-by: Xin Li <xin.b.li@intel.com>
---

diff --git a/tools/firmware/vmxassist/vm86.c b/tools/firmware/vmxassist/vm86.c
index 7a76ad8b15..4715c31075 100644
--- a/tools/firmware/vmxassist/vm86.c
+++ b/tools/firmware/vmxassist/vm86.c
@@ -297,7 +297,7 @@ getreg32(struct regs *regs, int r)
 	case 1: return regs->ecx;
 	case 2: return regs->edx;
 	case 3: return regs->ebx;
-	case 4: return regs->esp;
+	case 4: return regs->uesp;
 	case 5: return regs->ebp;
 	case 6: return regs->esi;
 	case 7: return regs->edi;
@@ -319,10 +319,10 @@ getreg8(struct regs *regs, int r)
 	case 1: return regs->ecx & 0xFF; /* cl */
 	case 2: return regs->edx & 0xFF; /* dl */
 	case 3: return regs->ebx & 0xFF; /* bl */
-	case 4: return (regs->esp >> 8) & 0xFF; /* ah */
-	case 5: return (regs->ebp >> 8) & 0xFF; /* ch */
-	case 6: return (regs->esi >> 8) & 0xFF; /* dh */
-	case 7: return (regs->edi >> 8) & 0xFF; /* bh */
+	case 4: return (regs->eax >> 8) & 0xFF; /* ah */
+	case 5: return (regs->ecx >> 8) & 0xFF; /* ch */
+	case 6: return (regs->edx >> 8) & 0xFF; /* dh */
+	case 7: return (regs->ebx >> 8) & 0xFF; /* bh */
 	}
 	return ~0;
 }
@@ -335,7 +335,7 @@ setreg32(struct regs *regs, int r, unsigned v)
 	case 1: regs->ecx = v; break;
 	case 2: regs->edx = v; break;
 	case 3: regs->ebx = v; break;
-	case 4: regs->esp = v; break;
+	case 4: regs->uesp = v; break;
 	case 5: regs->ebp = v; break;
 	case 6: regs->esi = v; break;
 	case 7: regs->edi = v; break;
@@ -357,10 +357,10 @@ setreg8(struct regs *regs, int r, unsigned v)
 	case 1: regs->ecx = (regs->ecx & ~0xFF) | v; break;
 	case 2: regs->edx = (regs->edx & ~0xFF) | v; break;
 	case 3: regs->ebx = (regs->ebx & ~0xFF) | v; break;
-	case 4: regs->esp = (regs->esp & ~0xFF00) | (v << 8); break;
-	case 5: regs->ebp = (regs->ebp & ~0xFF00) | (v << 8); break;
-	case 6: regs->esi = (regs->esi & ~0xFF00) | (v << 8); break;
-	case 7: regs->edi = (regs->edi & ~0xFF00) | (v << 8); break;
+	case 4: regs->eax = (regs->eax & ~0xFF00) | (v << 8); break;
+	case 5: regs->ecx = (regs->ecx & ~0xFF00) | (v << 8); break;
+	case 6: regs->edx = (regs->edx & ~0xFF00) | (v << 8); break;
+	case 7: regs->ebx = (regs->ebx & ~0xFF00) | (v << 8); break;
 	}
 }